Bug Fix

Few bugs that were fixed, all should work now.