Added error flags, fixed form links