fixed slight bugs left over