Updating Main to include all refactors we developed for v0.9.2

This MR basically resolves issues:

#36 (closed), #38 (closed), #32 (closed), #21 (closed), #25 (closed), #15 (closed), #37 (closed), #30 (closed)