Small fixes and added .py extension to modules for clarity