Dev

Changed some varibles!