crapload of changes
change some stuff