fix bugs and finish link applications
ready for deploy