cleanup and fixed some shits :s