PJX: Added a lot, im not even sure all the stuff i added since last commit