Added some error messaging
Added effects
Cleaned up some stuff