timer added, fixed a couple things