Alt fix draft

Bugs fixed and extensively tested