2 normal priority bugs fixed