Finished of more effects, cleaned up the code and made the system more stable