cleaned everything up a bit, everything works well