Tested and Fixed stuff