Fixing some bugs + modules