Cleaned up modules + bugfixes